Merge branch 'master' of xenbits.xen.org:/home/xen/git/xen into staging
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 3 Dec 2014 17:03:59 +0000 (17:03 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 3 Dec 2014 17:03:59 +0000 (17:03 +0000)
commit1671a60a9b4d288c10ce8eada5fc4e20793b32e5
tree2009d5dabd65c6b0a20df490a484114c985dbb5b
parent4d1a77ba7ab94183c203226d3fe7ac1cd087c59b
parent3a80985b894f54eb3b2e143e4dea737cf139a517
Merge branch 'master' of xenbits.xen.org:/home/xen/git/xen into staging